<<<<<<< HEAD

<!DOCTYPE html>
<html lang="zh">
    <head>
        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
        <title>文兴资讯-您身边的资讯秘书</title>
        <META name="keywords" content="家日记,家庭日记,家庭,私密日记"/>
        <META name="description" content="家日记是和家人分享生活点滴的地方。这里你可以写每天的心情，发生的故事，上传你近期的照片，让远方的父母亲人了解你的近况。并且，这是完全私密的，家庭以外的成员将不会看到日记的内容。">
        <link rel="stylesheet" type="text/css" href="../css/bootstrap.min.css">
        <link rel="stylesheet" type="text/css" href="../css/bootstrap-responsive.min.css">
        <script src="../js/jquery-1.9.1.min.js"></script>
        <script src="../js/bootstrap.min.js"></script>
        <style type="text/css">
=======
<!DOCTYPE html>
<html lang="zh">
<head>
	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
	<title>文兴资讯-您身边的资讯秘书</title>
	<META name="keywords" content="家日记,家庭日记,家庭,私密日记"/>
	<META name="description" content="家日记是和家人分享生活点滴的地方。这里你可以写每天的心情，发生的故事，上传你近期的照片，让远方的父母亲人了解你的近况。并且，这是完全私密的，家庭以外的成员将不会看到日记的内容。">
	<link rel="stylesheet" type="text/css" href="../css/bootstrap.min.css">
	<link rel="stylesheet" type="text/css" href="../css/bootstrap-responsive.min.css">
	<script src="../js/jquery-1.9.1.min.js"></script>
	<script src="../js/bootstrap.min.js"></script>
	<style type="text/css">
>>>>>>> origin/duwenlong
            body {
                padding-top: 60px;
                padding-bottom: 40px;
            }
            .form-horizontal .control-label {
                text-align: inherit;
                width: 60px;
            }
            .form-horizontal .controls {
                margin-left:0;
            }
            input{
                width: 90%;
            }
<<<<<<< HEAD
        </style>

    </head>
    <body>
        <!--navbar-->
        <div class="navbar navbar-inverse navbar-fixed-top">
            <div class="navbar-inner">
                <div class="container">
                    <a class="brand" href="#">文兴资讯</a>
                    <div class="nav-collapse collapse">
                        <ul class="nav">
                            <li><a title="首页"  href="index.html">首页</a></li>
                            <li><a title="订阅" href="order.html">订阅</a></li>
                            <!--  <li><a title="加入收藏" onClick="AddFavorite(window.location, document.title)" href="#">分类</a></li>-->
                            <li><a title="下载到桌面" href="/family_control-download_to_desktop.html" target="_blank">客户端</a></li>
                        </ul>
                        <form class="navbar-search pull-right">
                            <input type="text" class="search-query" placeholder="Search">
                        </form>
                    </div><!--/.nav-collapse -->
                </div>
            </div>
        </div>
        <!--navbar End-->

        <div class="container-fluid">
            <div class="row-fluid">
                <div class="span3">

                    <!--login form-->
                    <div class="well sidebar-nav" style="padding-bottom:5px">
                        <div > 个人信息</div>
                        <div class="thumbnail">
                            <img alt="100x100" data-src="holder.js/100x100" style="width:164x;height: 130px;" src="../upload/1.jpg">
                            <div class="caption">
                                <strong style="color:#825d5b">天学者</strong>
                                <p style="color:#afafaf;font-size: 12px">晓英视<br>
                                    <span style="color:red;font-size: 12px">更新至22章</span></p>
                            </div>

                        </div>
                        <ul class="nav nav-tabs nav-stacked">
                            <li class="active"><a href="#"><i class="icon-th-list"></i> 作品</a></li>
                               <li class=""><a href="#"><i class="icon-star"></i> 订阅</a></li>
                         <li class=""><a href="#"><i class="icon-bookmark"></i> 关注</a></li>
                            <li><a href="#"><i class="icon-envelope"> </i> 私信</a></li>
                                  <li><a href="#"><i class="icon-user"> </i> 关于我</a></li>
                        </ul>

                    </div>
                    <!--/.well -->
                    <!--login form End-->

                </div>
                <!--/span-->
                <div class="span9">
                    <div class="row-fluid">
                        <div class="page-header">
                            <h5> 我的作品</h5>
                        </div>

                        <table class="table table-striped">
                            <thead>
                                <tr>
                                    <th>序号</th>
                                    <th>作品</th>
                                    <th>发布时间</th>
                                    <th>点击</th>
                                </tr>
                            </thead>
                            <tbody>
                                <tr>
                                    <td>1</td>
                                    <td>天学者</td>
                                    <td>2013-06025</td>
                                    <td>1000</td>
                                </tr>

                                <tr>
                                    <td>1</td>
                                    <td>天学者(第二部)</td>
                                    <td>2013-06025</td>
                                    <td>1000</td>
                                </tr>
                                <tr>
                                    <td>1</td>
                                    <td>天学者（第三部）</td>
                                    <td>2013-06025</td>
                                    <td>1000</td>
                                </tr>
                            </tbody>
                        </table>

                    </div>
                </div>


            </div>
            <hr><!--/.fluid-container-->
            <footer><p align="center">Copyright &copy; 2012-2013&nbsp;&nbsp;文兴资讯

                </p></footer>


    </body>
</html>
=======

            .tdl{text-align: justify; width: 15%;}
        </style>

</head>
<body>
	<!--navbar-->
	<div class="navbar navbar-inverse navbar-fixed-top">
		<div class="navbar-inner">
			<div class="container">
				<a class="brand" href="#">文兴资讯</a>
				<div class="nav-collapse collapse">
					<ul class="nav">
						<li>
							<a title="首页"  href="index.html">首页</a>
						</li>
						<li>
							<a title="订阅" href="order.html">订阅</a>
						</li>
						<!--  <li>
						<a title="加入收藏" onClick="AddFavorite(window.location, document.title)" href="#">分类</a>
					</li>
					-->
					<li>
						<a title="下载到桌面" href="/family_control-download_to_desktop.html" target="_blank">客户端</a>
					</li>
				</ul>
				<form class="navbar-search pull-right">
					<input type="text" class="search-query" placeholder="Search"></form>
			</div>
			<!--/.nav-collapse -->
		</div>
	</div>
</div>
<!--navbar End-->

<div class="container-fluid">
	<div class="row-fluid">
		<div class="span2">

			<!--login form-->

			<ul class="nav nav-tabs nav-stacked" style="background-color:#f8f8f8" >
				<li class="active">
					<a href="index.html"> <i class="icon-th-list"></i>
						首页
					</a>
				</li>
				<li>
					<a href="set.html"> <i class="icon-star"></i>
						设置
					</a>
				</li>
				<li class="">
					<a href="security.html">
						<i class="icon-bookmark"></i>
						安全
					</a>
				</li>
				<li>
					<a href="manage.html">
						<i class="icon-envelope"></i>
						管理
					</a>
				</li>
				<li>
					<a href="about.html">
						<i class="icon-user"></i>
						关于
					</a>
				</li>
			</ul>

			<!--/.well -->
			<!--login form End-->

		</div>
		<!--/span-->
		<div class="span10">
			<div class="row-fluid">
			<!--<div class="page-header"><strong>系统信息</strong></div> -->
		 <ul class="breadcrumb">
                            <li>
                                <a href="#">首页</a> <span class="divider">/</span>
                            </li>
                            <li>
                                <a href="#">系统信息</a> <span class="divider">/</span>
                            </li>
                    
                        </ul>
			</div>
			<table class="table table-striped">
			<tr>
				<td  class="tdl">操作系统</td><td class="text-left">centos 6.3.2</td>
			</tr>
			<tr>
				<td  class="tdl">MYSQL版本</td><td class="text-left">centos 6.3.2</td>
			</tr>
			<tr>
				<td  class="tdl">PHP VERSION</td><td class="text-left">centos 6.3.2</td>
			</tr>
			<tr>
				<td  class="tdl">是否支持上传</td><td class="text-left">centos 6.3.2</td>
			</tr>
			<tr>
				<td  class="tdl">最新版本</td><td class="text-left">centos 6.3.2</td>
			</tr>
			<tr>
				<td  class="tdl">操作系统</td><td class="text-left">centos 6.3.2</td>
			</tr>
			<tr>
				<td  class="tdl">操作系统</td><td class="text-left">centos 6.3.2</td>
			</tr>
			<tr>
				<td  class="tdl">操作系统</td><td class="text-left">centos 6.3.2</td>
			</tr>
			<tr>
				<td  class="tdl">操作系统</td><td class="text-left">centos 6.3.2</td>
			</tr>
			<tr>
				<td  class="tdl">操作系统</td><td class="text-left">centos 6.3.2</td>
			</tr>
			<tr>
				<td  class="tdl">操作系统</td><td class="text-left">centos 6.3.2</td>
			</tr>
			</table>

		</div>
	</div>

</div>
<hr>
<!--/.fluid-container-->
<footer>
	<p align="center">Copyright &copy; 2012-2013&nbsp;&nbsp;文兴资讯</p>
</footer>

</body>
</html>
>>>>>>> origin/duwenlong
